Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / common / BookingInterface.java

diff --git a/ruralHouses client/src/common/BookingInterface.java b/ruralHouses client/src/common/BookingInterface.java
new file mode 100644 (file)
index 0000000..8262f30
--- /dev/null
+++ b/ruralHouses client/src/common/BookingInterface.java
@@ -0,0 +1,28 @@
+package common;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.Date;
+import java.util.Vector;
+
+import domain.Booking;
+import domain.Client;
+import domain.RuralHouse;
+import exceptions.OfferCanNotBeBooked;
+
+public interface BookingInterface extends Remote {
+
+
+       public int getNumber() throws RemoteException;
+
+
+       public void removeDenyBooking(Booking b) throws RemoteException;
+
+
+       public void acceptBooking(Booking b) throws RemoteException;
+               
+       public Vector<Booking> createBooking(RuralHouse ruralHouse, Date firstDate,
+                               Date lastDate, Client client)
+                               throws OfferCanNotBeBooked,RemoteException ;
+
+}
\ No newline at end of file